repo: Drop ostree_repo_load_variant_c API

Originally we had this to avoid forcing callers to malloc() if they
had a csum, but nowadays we have in-place conversion APIs that are
fast enough.

diff --git a/doc/ostree-sections.txt b/doc/ostree-sections.txt
index e2686fb4e34f0fd80a5ae9410965181a024fd2c9..570c327b8f1d96d8fef2857aba42a089c77555f3 100644 (file)
--- a/doc/ostree-sections.txt
+++ b/doc/ostree-sections.txt
@@ -90,7 +90,6 @@ ostree_repo_resolve_rev
 ostree_repo_write_ref
 ostree_repo_write_refspec
 ostree_repo_list_refs
-ostree_repo_load_variant_c
 ostree_repo_load_variant
 ostree_repo_load_variant_if_exists
 ostree_repo_load_file

diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index 9d1650bcaad1d66e16ab48dec62aff56a0663062..6ff7b1235ae4f36216d29ca8f8e1b3d0f592ce75 100644 (file)
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -169,6 +169,7 @@ do_resolve_commit (OstreeRepoFile  *self,
   gs_unref_variant GVariant *root_metadata = NULL;
   gs_unref_variant GVariant *tree_contents_csum_v = NULL;
   gs_unref_variant GVariant *tree_metadata_csum_v = NULL;
+  char tmp_checksum[65];
 
   g_assert (self->parent == NULL);
 
@@ -178,16 +179,20 @@ do_resolve_commit (OstreeRepoFile  *self,
 
   /* PARSE OSTREE_OBJECT_TYPE_COMMIT */
   g_variant_get_child (commit, 6, "@ay", &tree_contents_csum_v);
-  g_variant_get_child (commit, 7, "@ay", &tree_metadata_csum_v);
 
-  if (!ostree_repo_load_variant_c (self->repo, OSTREE_OBJECT_TYPE_DIR_TREE,
-                                   ostree_checksum_bytes_peek (tree_contents_csum_v),
-                                   &root_contents, error))
+  ostree_checksum_inplace_from_bytes (g_variant_get_data (tree_contents_csum_v), tmp_checksum);
+
+  if (!ostree_repo_load_variant (self->repo, OSTREE_OBJECT_TYPE_DIR_TREE,
+                                 tmp_checksum,
+                                 &root_contents, error))
     goto out;
 
-  if (!ostree_repo_load_variant_c (self->repo, OSTREE_OBJECT_TYPE_DIR_META,
-                                   ostree_checksum_bytes_peek (tree_metadata_csum_v),
-                                   &root_metadata, error))
+  g_variant_get_child (commit, 7, "@ay", &tree_metadata_csum_v);
+  ostree_checksum_inplace_from_bytes (g_variant_get_data (tree_metadata_csum_v), tmp_checksum);
+
+  if (!ostree_repo_load_variant (self->repo, OSTREE_OBJECT_TYPE_DIR_META,
+                                 tmp_checksum,
+                                 &root_metadata, error))
     goto out;
   
   self->tree_metadata = root_metadata;

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index b44401cb6582827b7bb28b68b537fc378833d83a..8d86895f43741128a157b05f6deb4c2ce349a790 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2584,37 +2584,6 @@ ostree_repo_query_object_storage_size (OstreeRepo           *self,
   return ret;
 }
 
-/**
- * ostree_repo_load_variant_c:
- * @self: Repo
- * @objtype: Expected object type
- * @csum: Binary checksum
- * @out_variant: (out): (transfer full): Metadata object
- * @error: Error
- * 
- * Load the metadata object @csum of type @objtype, storing the
- * result in @out_variant.
- */
-gboolean
-ostree_repo_load_variant_c (OstreeRepo          *self,
-                            OstreeObjectType     objtype,
-                            const guchar        *csum, 
-                            GVariant           **out_variant,
-                            GError             **error)
-{
-  gboolean ret = FALSE;
-  gs_free char *checksum = NULL;
-
-  checksum = ostree_checksum_from_bytes (csum);
-
-  if (!ostree_repo_load_variant (self, objtype, checksum, out_variant, error))
-    goto out;
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
 /**
  * ostree_repo_load_variant_if_exists:
  * @self: Repo

diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 73637c1ea995c3ab130664860b1fef998caa4462..2465f51fef97c3fda3ed9d5589e680974002d490 100644 (file)
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -181,12 +181,6 @@ gboolean      ostree_repo_list_refs (OstreeRepo       *self,
                                      GCancellable     *cancellable,
                                      GError          **error);
 
-gboolean      ostree_repo_load_variant_c (OstreeRepo  *self,
-                                          OstreeObjectType objtype,
-                                          const guchar  *csum,       
-                                          GVariant     **out_variant,
-                                          GError       **error);
-
 gboolean      ostree_repo_load_variant (OstreeRepo  *self,
                                         OstreeObjectType objtype,
                                         const char    *sha256,